From 4e08869e1a1f99162bb1e5387455816fdbc27366 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Thu, 11 Jan 2018 14:30:16 -0800 Subject: [PATCH] Make a strong reference to LifecycleOwner in tests Change-Id: Id3b26ded6c903b67b9880dbfe1a0656a564c8947 Fixes: 71867776 Test: rerun tests --- .../AccountHeaderPreferenceControllerTest.java | 16 ++++++++-------- .../AssistContextPreferenceControllerTest.java | 5 ++++- ...ssistFlashScreenPreferenceControllerTest.java | 5 ++++- .../BluetoothDetailsControllerTestBase.java | 5 ++++- .../ConnectedDeviceGroupControllerTest.java | 5 ++++- .../SuggestionControllerMixinTest.java | 6 +++++- ...actBluetoothA2dpPreferenceControllerTest.java | 5 ++++- ...dioBitsPerSamplePreferenceControllerTest.java | 5 ++++- ...AudioChannelModePreferenceControllerTest.java | 5 ++++- ...etoothAudioCodecPreferenceControllerTest.java | 5 ++++- ...oothAudioQualityPreferenceControllerTest.java | 5 ++++- ...hAudioSampleRatePreferenceControllerTest.java | 5 ++++- .../DevelopmentSwitchBarControllerTest.java | 5 ++++- .../LogPersistPreferenceControllerTest.java | 5 ++++- ...PictureColorModePreferenceControllerTest.java | 5 ++++- .../SelectUsbConfigPreferenceControllerTest.java | 5 ++++- .../FeatureFlagPreferenceControllerTest.java | 5 ++++- .../BuildNumberPreferenceControllerTest.java | 5 ++++- .../simstatus/SimStatusDialogControllerTest.java | 5 ++++- .../AutoRotatePreferenceControllerTest.java | 5 ++++- .../BatteryHeaderPreferenceControllerTest.java | 5 ++++- .../settings/location/LocationEnablerTest.java | 5 ++++- .../LocationForWorkPreferenceControllerTest.java | 5 ++++- ...odeBatterySavingPreferenceControllerTest.java | 5 ++++- ...ModeHighAccuracyPreferenceControllerTest.java | 5 ++++- .../LocationModePreferenceControllerTest.java | 5 ++++- ...nModeRadioButtonPreferenceControllerTest.java | 5 ++++- ...nModeSensorsOnlyPreferenceControllerTest.java | 5 ++++- .../LocationPreferenceControllerTest.java | 5 ++++- .../LocationServicePreferenceControllerTest.java | 5 ++++- .../LocationSwitchBarControllerTest.java | 5 ++++- ...tLocationRequestPreferenceControllerTest.java | 12 +++++++++--- .../AirplaneModePreferenceControllerTest.java | 5 ++++- .../MobileNetworkPreferenceControllerTest.java | 5 ++++- .../network/VpnPreferenceControllerTest.java | 5 ++++- ...rictedEncryptionPreferenceControllerTest.java | 5 ++++- ...lePatternProfilePreferenceControllerTest.java | 5 ++++- .../LockScreenPreferenceControllerTest.java | 5 ++++- .../TrustAgentListPreferenceControllerTest.java | 5 ++++- .../widget/ActionBarShadowControllerTest.java | 5 ++++- .../wifi/WifiInfoPreferenceControllerTest.java | 5 ++++- .../wifi/WpsPreferenceControllerTest.java | 5 ++++- .../WifiDetailPreferenceControllerTest.java | 5 ++++- .../p2p/WifiP2PPreferenceControllerTest.java | 5 ++++- .../WifiTetherPreferenceControllerTest.java | 5 ++++- 45 files changed, 190 insertions(+), 54 deletions(-) diff --git a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java index f4090959775..73a58bf24ee 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java @@ -17,15 +17,14 @@ package com.android.settings.accounts; import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; import android.accounts.Account; import android.app.Activity; +import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.os.Bundle; import android.os.UserHandle; @@ -55,9 +54,9 @@ import org.robolectric.annotation.Implements; @RunWith(SettingsRobolectricTestRunner.class) @Config( - manifest = TestConfig.MANIFEST_PATH, - sdk = TestConfig.SDK_VERSION, - shadows = AccountHeaderPreferenceControllerTest.ShadowAuthenticatorHelper.class + manifest = TestConfig.MANIFEST_PATH, + sdk = TestConfig.SDK_VERSION, + shadows = AccountHeaderPreferenceControllerTest.ShadowAuthenticatorHelper.class ) public class AccountHeaderPreferenceControllerTest { @@ -74,8 +73,8 @@ public class AccountHeaderPreferenceControllerTest { private AccountHeaderPreferenceController mController; - private Lifecycle mLifecycle = - new Lifecycle(() -> AccountHeaderPreferenceControllerTest.this.mLifecycle); + private LifecycleOwner mLifecycleOwner; + private Lifecycle mLifecycle; @Before public void setUp() { @@ -84,7 +83,8 @@ public class AccountHeaderPreferenceControllerTest { mHeaderPreference = new LayoutPreference( RuntimeEnvironment.application, R.layout.settings_entity_header); doReturn(mContext).when(mActivity).getApplicationContext(); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); } @Test diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java index c59ac1884b7..968f0497edf 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java @@ -26,6 +26,7 @@ import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; @@ -57,13 +58,15 @@ public class AssistContextPreferenceControllerTest { private AssistContextPreferenceController.SettingObserver mObserver; private Context mContext; private AssistContextPreferenceController mController; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; @Before public void setUp() { MockitoAnnotations.initMocks(this); when(mScreen.findPreference(anyString())).thenReturn(mPreference); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mContext = RuntimeEnvironment.application; mController = new AssistContextPreferenceController(mContext, mLifecycle); ReflectionHelpers.setField(mController, "mSettingObserver", mObserver); diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java index 1dec8d086fa..57b809ee1bb 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java @@ -28,6 +28,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; @@ -64,13 +65,15 @@ public class AssistFlashScreenPreferenceControllerTest { private AssistFlashScreenPreferenceController.SettingObserver mObserver; private Context mContext; private AssistFlashScreenPreferenceController mController; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; @Before public void setUp() { MockitoAnnotations.initMocks(this); when(mScreen.findPreference(anyString())).thenReturn(mPreference); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mContext = RuntimeEnvironment.application; mController = spy(new AssistFlashScreenPreferenceController(mContext, mLifecycle)); mLifecycle.addObserver(mController); diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java index 8f3d3c2d192..7f58254a23e 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java @@ -19,6 +19,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.app.Activity; +import android.arch.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothClass; import android.bluetooth.BluetoothDevice; @@ -44,6 +45,7 @@ import org.robolectric.annotation.Config; @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class BluetoothDetailsControllerTestBase { protected Context mContext; + private LifecycleOwner mLifecycleOwner; protected Lifecycle mLifecycle; protected DeviceConfig mDeviceConfig; protected BluetoothDevice mDevice; @@ -73,7 +75,8 @@ public class BluetoothDetailsControllerTestBase { when(mFragment.getContext()).thenReturn(mContext); when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager); when(mFragment.getPreferenceScreen()).thenReturn(mScreen); - mLifecycle = spy(new Lifecycle(() -> mLifecycle)); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = spy(new Lifecycle(mLifecycleOwner)); mBluetoothManager = new BluetoothManager(mContext); mBluetoothAdapter = mBluetoothManager.getAdapter(); } diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java index aa5eb67342f..78be742df6e 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java @@ -22,6 +22,7 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; +import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceGroup; @@ -63,6 +64,7 @@ public class ConnectedDeviceGroupControllerTest { private Context mContext; private Preference mPreference; private ConnectedDeviceGroupController mConnectedDeviceGroupController; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; @Before @@ -72,7 +74,8 @@ public class ConnectedDeviceGroupControllerTest { mContext = RuntimeEnvironment.application; mPreference = new Preference(mContext); mPreference.setKey(PREFERENCE_KEY_1); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mPreferenceGroup = spy(new PreferenceScreen(mContext, null)); doReturn(mPreferenceManager).when(mPreferenceGroup).getPreferenceManager(); doReturn(mContext).when(mDashboardFragment).getContext(); diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionControllerMixinTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionControllerMixinTest.java index bceb8659be9..822cb10451f 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionControllerMixinTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionControllerMixinTest.java @@ -24,6 +24,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.LoaderManager; +import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import com.android.settings.TestConfig; @@ -49,7 +50,9 @@ public class SuggestionControllerMixinTest { @Mock private SuggestionControllerMixin.SuggestionControllerHost mHost; + private Context mContext; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; private SuggestionControllerMixin mMixin; @@ -58,7 +61,8 @@ public class SuggestionControllerMixinTest { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; FakeFeatureFactory.setupForTest(); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); } @After diff --git a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java index 582400df6dc..a7ae938f694 100644 --- a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java @@ -27,6 +27,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothA2dp; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; @@ -60,6 +61,7 @@ public class AbstractBluetoothA2dpPreferenceControllerTest { @Mock private BluetoothA2dpConfigStore mBluetoothA2dpConfigStore; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; private Context mContext; private AbstractBluetoothA2dpPreferenceController mController; @@ -68,7 +70,8 @@ public class AbstractBluetoothA2dpPreferenceControllerTest { public void setup() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mController = spy(new AbstractBluetoothA2dpPreferenceControllerImpl(mContext, mLifecycle, mBluetoothA2dpConfigStore)); doReturn(mBluetoothCodecConfig).when(mController).getCodecConfig(); diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java index fe0a41a8e92..7074c589d56 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java @@ -22,6 +22,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; import android.support.v7.preference.ListPreference; @@ -61,13 +62,15 @@ public class BluetoothAudioBitsPerSamplePreferenceControllerTest { private String[] mListValues; private Context mContext; private BluetoothAudioBitsPerSamplePreferenceController mController; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; @Before public void setup() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mController = spy(new BluetoothAudioBitsPerSamplePreferenceController(mContext, mLifecycle, mBluetoothA2dpConfigStore)); mListValues = mController.getListValues(); diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java index c4dcc19bd1b..fd7b0969417 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java @@ -22,6 +22,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; import android.support.v7.preference.ListPreference; @@ -60,13 +61,15 @@ public class BluetoothAudioChannelModePreferenceControllerTest { private String[] mListValues; private Context mContext; private BluetoothAudioChannelModePreferenceController mController; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; @Before public void setup() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mController = spy(new BluetoothAudioChannelModePreferenceController(mContext, mLifecycle, mBluetoothA2dpConfigStore)); mListValues = mController.getListValues(); diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java index 29d80473479..43bf3ea3f4e 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java @@ -22,6 +22,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; import android.support.v7.preference.ListPreference; @@ -65,13 +66,15 @@ public class BluetoothAudioCodecPreferenceControllerTest { private String[] mListValues; private Context mContext; private BluetoothAudioCodecPreferenceController mController; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; @Before public void setup() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mController = spy(new BluetoothAudioCodecPreferenceController(mContext, mLifecycle, mBluetoothA2dpConfigStore)); mListValues = mController.getListValues(); diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java index e76f1d0501d..1aff160d58b 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java @@ -22,6 +22,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; import android.support.v7.preference.ListPreference; @@ -60,13 +61,15 @@ public class BluetoothAudioQualityPreferenceControllerTest { private String[] mListValues; private Context mContext; private BluetoothAudioQualityPreferenceController mController; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; @Before public void setup() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mController = spy(new BluetoothAudioQualityPreferenceController(mContext, mLifecycle, mBluetoothA2dpConfigStore)); mListValues = mController.getListValues(); diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java index 4c113b15612..3eab3594168 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java @@ -22,6 +22,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; import android.support.v7.preference.ListPreference; @@ -60,6 +61,7 @@ public class BluetoothAudioSampleRatePreferenceControllerTest { * 4: 96.0 kHz */ private String[] mListValues; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; private Context mContext; private BluetoothAudioSampleRatePreferenceController mController; @@ -68,7 +70,8 @@ public class BluetoothAudioSampleRatePreferenceControllerTest { public void setup() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mController = spy(new BluetoothAudioSampleRatePreferenceController(mContext, mLifecycle, mBluetoothA2dpConfigStore)); mListValues = mController.getListValues(); diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java index bfe30fb0f70..a5dfa56d3c6 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java @@ -23,6 +23,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import com.android.settings.TestConfig; @@ -53,6 +54,7 @@ public class DevelopmentSwitchBarControllerTest { @Mock private DevelopmentSettingsDashboardFragment mSettings; private Context mContext; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; private SwitchBar mSwitchBar; private DevelopmentSwitchBarController mController; @@ -61,7 +63,8 @@ public class DevelopmentSwitchBarControllerTest { public void setUp() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mSwitchBar = new SwitchBar(mContext); when(mSettings.getContext()).thenReturn(mContext); } diff --git a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java index 1dc1255514e..57978a6ce69 100644 --- a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java @@ -19,6 +19,7 @@ package com.android.settings.development; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.os.SystemProperties; import android.support.v7.preference.ListPreference; @@ -53,13 +54,15 @@ public class LogPersistPreferenceControllerTest { private Context mContext; private LogPersistPreferenceController mController; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; @Before public void setup() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mController = new LogPersistPreferenceController(mContext, mFragment, mLifecycle); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); SystemProperties.set("ro.debuggable", "1"); diff --git a/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java index fac74acd92d..8a7198dc2b4 100644 --- a/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java @@ -26,6 +26,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.content.res.Resources; import android.support.v7.preference.PreferenceScreen; @@ -55,13 +56,15 @@ public class PictureColorModePreferenceControllerTest { @Mock private Resources mResources; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; private PictureColorModePreferenceController mController; @Before public void setup() { MockitoAnnotations.initMocks(this); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mController = new PictureColorModePreferenceController(mContext, mLifecycle); when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn( mPreference); diff --git a/tests/robotests/src/com/android/settings/development/SelectUsbConfigPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SelectUsbConfigPreferenceControllerTest.java index 6b559844bda..8719bb4246a 100644 --- a/tests/robotests/src/com/android/settings/development/SelectUsbConfigPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SelectUsbConfigPreferenceControllerTest.java @@ -33,6 +33,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.PackageManager; import android.hardware.usb.UsbManager; @@ -70,6 +71,7 @@ public class SelectUsbConfigPreferenceControllerTest { private PackageManager mPackageManager; private Context mContext; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; private SelectUsbConfigPreferenceController mController; @@ -89,7 +91,8 @@ public class SelectUsbConfigPreferenceControllerTest { @Before public void setup() { MockitoAnnotations.initMocks(this); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mContext = spy(RuntimeEnvironment.application); doReturn(mUsbManager).when(mContext).getSystemService(Context.USB_SERVICE); doReturn(mPackageManager).when(mContext).getPackageManager(); diff --git a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java index f831506a8d1..8c38d22c2ec 100644 --- a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java @@ -25,6 +25,7 @@ import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.support.v7.preference.PreferenceScreen; @@ -47,6 +48,7 @@ public class FeatureFlagPreferenceControllerTest { @Mock private PreferenceScreen mScreen; private Context mContext; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; private FeatureFlagsPreferenceController mController; @@ -54,7 +56,8 @@ public class FeatureFlagPreferenceControllerTest { public void setUp() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mController = new FeatureFlagsPreferenceController(mContext, mLifecycle); when(mScreen.getContext()).thenReturn(mContext); mController.displayPreference(mScreen); diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java index ab68c1701df..ee5d5d05f78 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java @@ -28,6 +28,7 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.app.Fragment; +import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.os.Build; import android.os.UserManager; @@ -74,6 +75,7 @@ public class BuildNumberPreferenceControllerTest { @Mock private UserManager mUserManager; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; private FakeFeatureFactory mFactory; private Preference mPreference; @@ -83,7 +85,8 @@ public class BuildNumberPreferenceControllerTest { public void setUp() { MockitoAnnotations.initMocks(this); mFactory = FakeFeatureFactory.setupForTest(); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); mController = new BuildNumberPreferenceController( mContext, mActivity, mFragment, mLifecycle); diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java index 2f896ac9f27..cea4580365c 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java @@ -47,6 +47,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.os.PersistableBundle; import android.telephony.CarrierConfigManager; @@ -94,6 +95,7 @@ public class SimStatusDialogControllerTest { private SimStatusDialogController mController; private Context mContext; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; @Before @@ -101,7 +103,8 @@ public class SimStatusDialogControllerTest { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; when(mDialog.getContext()).thenReturn(mContext); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mController = spy( new SimStatusDialogController(mDialog, mLifecycle, 0 /* phone id */)); doReturn(mServiceState).when(mController).getCurrentServiceState(); diff --git a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java index f3a1eddc907..affb40b3d23 100644 --- a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java @@ -21,6 +21,7 @@ import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.content.ContentResolver; import android.content.Context; import android.content.pm.PackageManager; @@ -56,6 +57,7 @@ public class AutoRotatePreferenceControllerTest { private Context mContext; @Mock private PackageManager mPackageManager; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; private SwitchPreference mPreference; private ContentResolver mContentResolver; @@ -66,7 +68,8 @@ public class AutoRotatePreferenceControllerTest { MockitoAnnotations.initMocks(this); FakeFeatureFactory.setupForTest(); mContentResolver = RuntimeEnvironment.application.getContentResolver(); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mPreference = new SwitchPreference(RuntimeEnvironment.application); when(mContext.getPackageManager()).thenReturn(mPackageManager); when(mContext.getContentResolver()).thenReturn(mContentResolver); diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java index 9276424fb9f..58bc14b4f2e 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java @@ -30,6 +30,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Activity; +import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.content.Intent; import android.os.BatteryManager; @@ -89,13 +90,15 @@ public class BatteryHeaderPreferenceControllerTest { private TextView mSummary2; private LayoutPreference mBatteryLayoutPref; private Intent mBatteryIntent; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; @Before public void setUp() { MockitoAnnotations.initMocks(this); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mContext = spy(RuntimeEnvironment.application); mBatteryMeterView = new BatteryMeterView(mContext); mBatteryPercentText = new TextView(mContext); diff --git a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java index 1e5077067b7..462b926d383 100644 --- a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java @@ -30,6 +30,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.ActivityManager; +import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.content.Intent; import android.content.pm.UserInfo; @@ -66,6 +67,7 @@ public class LocationEnablerTest { private Context mContext; private LocationEnabler mEnabler; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; @Before @@ -73,7 +75,8 @@ public class LocationEnablerTest { MockitoAnnotations.initMocks(this); mContext = spy(RuntimeEnvironment.application); when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mEnabler = spy(new LocationEnabler(mContext, mListener, mLifecycle)); } diff --git a/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java index 97fdb8387da..5b2455f0d96 100644 --- a/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java @@ -25,6 +25,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.UserInfo; import android.os.UserHandle; @@ -68,6 +69,7 @@ public class LocationForWorkPreferenceControllerTest { private Context mContext; private LocationForWorkPreferenceController mController; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; @Before @@ -75,7 +77,8 @@ public class LocationForWorkPreferenceControllerTest { MockitoAnnotations.initMocks(this); mContext = spy(RuntimeEnvironment.application); when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mController = spy(new LocationForWorkPreferenceController(mContext, mLifecycle)); mockManagedProfile(); ReflectionHelpers.setField(mController, "mLocationEnabler", mEnabler); diff --git a/tests/robotests/src/com/android/settings/location/LocationModeBatterySavingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationModeBatterySavingPreferenceControllerTest.java index aa05cc66502..41e9f1e7b2d 100644 --- a/tests/robotests/src/com/android/settings/location/LocationModeBatterySavingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationModeBatterySavingPreferenceControllerTest.java @@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.mock; +import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.provider.Settings; @@ -35,11 +36,13 @@ import org.robolectric.annotation.Config; @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class LocationModeBatterySavingPreferenceControllerTest { + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; @Before public void setUp() { - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); } @Test diff --git a/tests/robotests/src/com/android/settings/location/LocationModeHighAccuracyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationModeHighAccuracyPreferenceControllerTest.java index fd1bb027338..9c8bac63254 100644 --- a/tests/robotests/src/com/android/settings/location/LocationModeHighAccuracyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationModeHighAccuracyPreferenceControllerTest.java @@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.mock; +import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.provider.Settings; @@ -35,11 +36,13 @@ import org.robolectric.annotation.Config; @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class LocationModeHighAccuracyPreferenceControllerTest { + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; @Before public void setUp() { - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); } @Test diff --git a/tests/robotests/src/com/android/settings/location/LocationModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationModePreferenceControllerTest.java index 5383ed3a3fa..a28cb205be5 100644 --- a/tests/robotests/src/com/android/settings/location/LocationModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationModePreferenceControllerTest.java @@ -24,6 +24,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.os.UserManager; import android.provider.Settings; @@ -61,6 +62,7 @@ public class LocationModePreferenceControllerTest { private Context mContext; private LocationModePreferenceController mController; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; @Before @@ -68,7 +70,8 @@ public class LocationModePreferenceControllerTest { MockitoAnnotations.initMocks(this); mContext = spy(RuntimeEnvironment.application); when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mController = new LocationModePreferenceController(mContext, mFragment, mLifecycle); when(mFragment.getActivity()).thenReturn(mActivity); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); diff --git a/tests/robotests/src/com/android/settings/location/LocationModeRadioButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationModeRadioButtonPreferenceControllerTest.java index ae98acc0c5e..27667889d97 100644 --- a/tests/robotests/src/com/android/settings/location/LocationModeRadioButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationModeRadioButtonPreferenceControllerTest.java @@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.provider.Settings; import android.support.v7.preference.PreferenceScreen; @@ -49,13 +50,15 @@ public class LocationModeRadioButtonPreferenceControllerTest { private Context mContext; private LocationModeRadioButtonPreferenceController mController; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; @Before public void setUp() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mController = new LocationModeRadioButtonPreferenceControllerTestable(mContext, mLifecycle); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); } diff --git a/tests/robotests/src/com/android/settings/location/LocationModeSensorsOnlyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationModeSensorsOnlyPreferenceControllerTest.java index 8561c977df8..4ed75d28c4d 100644 --- a/tests/robotests/src/com/android/settings/location/LocationModeSensorsOnlyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationModeSensorsOnlyPreferenceControllerTest.java @@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.mock; +import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.provider.Settings; @@ -35,11 +36,13 @@ import org.robolectric.annotation.Config; @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class LocationModeSensorsOnlyPreferenceControllerTest { + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; @Before public void setUp() { - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); } @Test diff --git a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java index fe45a93b4c7..2c92b445c9a 100644 --- a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java @@ -25,6 +25,7 @@ import static org.mockito.Matchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.Context; @@ -62,6 +63,7 @@ public class LocationPreferenceControllerTest { @Mock private PreferenceScreen mScreen; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; private LocationPreferenceController mController; @@ -71,7 +73,8 @@ public class LocationPreferenceControllerTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mController = new LocationPreferenceController(mContext, mLifecycle); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); } diff --git a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java index caf15f824ad..51a375e2a56 100644 --- a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java @@ -25,6 +25,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.provider.Settings; import android.support.v7.preference.Preference; @@ -62,13 +63,15 @@ public class LocationServicePreferenceControllerTest { private Context mContext; private LocationServicePreferenceController mController; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; @Before public void setUp() { MockitoAnnotations.initMocks(this); mContext = spy(RuntimeEnvironment.application); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mController = spy(new LocationServicePreferenceController( mContext, mFragment, mLifecycle, mSettingsInjector)); final String key = mController.getPreferenceKey(); diff --git a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java index 35c0f82a544..6d824acca8a 100644 --- a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java @@ -22,6 +22,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.provider.Settings; @@ -54,6 +55,7 @@ public class LocationSwitchBarControllerTest { private Context mContext; private LocationSwitchBarController mController; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; @Before @@ -61,7 +63,8 @@ public class LocationSwitchBarControllerTest { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; ReflectionHelpers.setField(mSwitchBar, "mSwitch", mSwitch); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mController = spy(new LocationSwitchBarController( mContext, mSwitchBar, mLifecycle)); ReflectionHelpers.setField(mController, "mLocationEnabler", mEnabler); diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java index a9794c277e4..f114ff39dea 100644 --- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java @@ -25,6 +25,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.os.Bundle; import android.provider.Settings; @@ -33,6 +34,7 @@ import android.support.v7.preference.PreferenceCategory; import android.support.v7.preference.PreferenceScreen; import android.text.TextUtils; import android.util.FeatureFlagUtils; + import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.TestConfig; @@ -44,8 +46,7 @@ import com.android.settings.widget.AppPreference; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.location.RecentLocationApps; import com.android.settingslib.location.RecentLocationApps.Request; -import java.util.ArrayList; -import java.util.List; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -57,6 +58,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import java.util.ArrayList; +import java.util.List; + @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class RecentLocationRequestPreferenceControllerTest { @@ -72,13 +76,15 @@ public class RecentLocationRequestPreferenceControllerTest { private Context mContext; private RecentLocationRequestPreferenceController mController; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; @Before public void setUp() { MockitoAnnotations.initMocks(this); mContext = spy(RuntimeEnvironment.application); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mController = spy(new RecentLocationRequestPreferenceController( mContext, mFragment, mLifecycle, mRecentLocationApps)); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mCategory); diff --git a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java index 9dea6f5745b..b1072b16ef7 100644 --- a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java @@ -21,6 +21,7 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.PackageManager; import android.content.res.Resources; @@ -56,6 +57,7 @@ public class AirplaneModePreferenceControllerTest { private PackageManager mPackageManager; private AirplaneModePreferenceController mController; + private LifecycleOwner mLifecycleOwner; private Lifecycle mLifecycle; private FakeFeatureFactory mFactory; @@ -66,7 +68,8 @@ public class AirplaneModePreferenceControllerTest { doReturn(mResources).when(mContext).getResources(); doReturn(mPackageManager).when(mContext).getPackageManager(); mController = spy(new AirplaneModePreferenceController(mContext, null)); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mLifecycle.addObserver(mController); } diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java index d593b58df3c..f070f7a5095 100644 --- a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java @@ -27,6 +27,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.robolectric.shadow.api.Shadow.extract; +import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.net.ConnectivityManager; import android.os.UserManager; @@ -66,13 +67,15 @@ public class MobileNetworkPreferenceControllerTest { private PreferenceScreen mScreen; private Lifecycle mLifecycle; + private LifecycleOwner mLifecycleOwner; private MobileNetworkPreferenceController mController; @Before public void setUp() { MockitoAnnotations.initMocks(this); mContext = spy(RuntimeEnvironment.application); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); when(mContext.getSystemService(Context.TELEPHONY_SERVICE)) .thenReturn(mTelephonyManager); } diff --git a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java index c35f1cfa85a..d0305315012 100644 --- a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java @@ -27,6 +27,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.net.ConnectivityManager; import android.net.IConnectivityManager; @@ -65,6 +66,7 @@ public class VpnPreferenceControllerTest { private Preference mPreference; private VpnPreferenceController mController; private Lifecycle mLifecycle; + private LifecycleOwner mLifecycleOwner; @Before public void setUp() { @@ -77,7 +79,8 @@ public class VpnPreferenceControllerTest { when(mScreen.findPreference(anyString())).thenReturn(mPreference); mController = spy(new VpnPreferenceController(mContext)); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mLifecycle.addObserver(mController); } diff --git a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java index ef3f9cd7872..ee3f0ec2072 100644 --- a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java @@ -18,6 +18,7 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; +import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.os.UserManager; @@ -47,11 +48,13 @@ public class RestrictedEncryptionPreferenceControllerTest { private ResetCredentialsPreferenceController mResetCredentialsPreferenceController; private UserCredentialsPreferenceController mUserCredentialsPreferenceController; private Lifecycle mLifecycle; + private LifecycleOwner mLifecycleOwner; @Before public void setUp() { mContext = RuntimeEnvironment.application; - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mCredentialStoragePreferenceController = new CredentialStoragePreferenceController(mContext); mInstallCredentialsPreferenceController = diff --git a/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java index dd983727522..23d27316803 100644 --- a/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java @@ -27,6 +27,7 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.PackageManager; import android.hardware.fingerprint.FingerprintManager; @@ -63,6 +64,7 @@ public class VisiblePatternProfilePreferenceControllerTest { private UserManager mUm; private Lifecycle mLifecycle; + private LifecycleOwner mLifecycleOwner; private FakeFeatureFactory mFeatureFactory; private Context mContext; private VisiblePatternProfilePreferenceController mController; @@ -82,7 +84,8 @@ public class VisiblePatternProfilePreferenceControllerTest { .thenReturn(mLockPatternUtils); when(mUm.getProfileIdsWithDisabled(anyInt())).thenReturn(new int[] {FAKE_PROFILE_USER_ID}); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mController = new VisiblePatternProfilePreferenceController(mContext, mLifecycle); } diff --git a/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java index 671807b4e8c..f1a5d9b9614 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java @@ -26,6 +26,7 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.os.UserManager; import android.support.v7.preference.Preference; @@ -60,6 +61,7 @@ public class LockScreenPreferenceControllerTest { private PreferenceScreen mScreen; private Lifecycle mLifecycle; + private LifecycleOwner mLifecycleOwner; private FakeFeatureFactory mFeatureFactory; private Context mContext; private LockScreenPreferenceController mController; @@ -78,7 +80,8 @@ public class LockScreenPreferenceControllerTest { when(mUm.getProfileIdsWithDisabled(anyInt())).thenReturn(new int[] {FAKE_PROFILE_USER_ID}); mPreference = new Preference(mContext); when(mScreen.findPreference(anyString())).thenReturn(mPreference); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mController = new LockScreenPreferenceController(mContext, mLifecycle); } diff --git a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java index 6913c0c93a0..684274c044d 100644 --- a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java @@ -29,6 +29,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Activity; +import android.arch.lifecycle.LifecycleOwner; import android.content.ComponentName; import android.content.Context; import android.support.v7.preference.Preference; @@ -69,6 +70,7 @@ public class TrustAgentListPreferenceControllerTest { private SecuritySettingsV2 mFragment; private Lifecycle mLifecycle; + private LifecycleOwner mLifecycleOwner; private FakeFeatureFactory mFeatureFactory; private Activity mActivity; @@ -79,7 +81,8 @@ public class TrustAgentListPreferenceControllerTest { public void setUp() { MockitoAnnotations.initMocks(this); mActivity = Robolectric.buildActivity(Activity.class).get(); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); mFeatureFactory = FakeFeatureFactory.setupForTest(); when(mFeatureFactory.securityFeatureProvider.getLockPatternUtils(any(Context.class))) .thenReturn(mLockPatternUtils); diff --git a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java index 0f3eb31bb4f..d53af9df1f1 100644 --- a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java @@ -29,6 +29,7 @@ import static org.mockito.Mockito.when; import android.app.ActionBar; import android.app.Activity; +import android.arch.lifecycle.LifecycleOwner; import android.support.v7.widget.RecyclerView; import android.view.View; @@ -55,6 +56,7 @@ public class ActionBarShadowControllerTest { @Mock private ActionBar mActionBar; private Lifecycle mLifecycle; + private LifecycleOwner mLifecycleOwner; private View mView; @Before @@ -62,7 +64,8 @@ public class ActionBarShadowControllerTest { MockitoAnnotations.initMocks(this); when(mActivity.getActionBar()).thenReturn(mActionBar); mView = new View(RuntimeEnvironment.application); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); } @Test diff --git a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java index cf3cca75d1a..08ee0ef93f1 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java @@ -26,6 +26,7 @@ import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.content.BroadcastReceiver; import android.content.Context; import android.content.IntentFilter; @@ -61,12 +62,14 @@ public class WifiInfoPreferenceControllerTest { private Preference mMacPreference; private Lifecycle mLifecycle; + private LifecycleOwner mLifecycleOwner; private WifiInfoPreferenceController mController; @Before public void setUp() { MockitoAnnotations.initMocks(this); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); when(mContext.getSystemService(WifiManager.class)) .thenReturn(mWifiManager); when(mScreen.findPreference(anyString())) diff --git a/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java index 7a734e505dc..e4dfea4f3eb 100644 --- a/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java @@ -27,6 +27,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.FragmentManager; +import android.arch.lifecycle.LifecycleOwner; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -65,12 +66,14 @@ public class WpsPreferenceControllerTest { private Preference mWpsPinPref; private Lifecycle mLifecycle; + private LifecycleOwner mLifecycleOwner; private WpsPreferenceController mController; @Before public void setUp() { MockitoAnnotations.initMocks(this); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); when(mContext.getSystemService(WifiManager.class)) .thenReturn(mWifiManager); when(mScreen.findPreference(anyString())) diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java index 6a36a798820..4f774357612 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java @@ -33,6 +33,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Activity; +import android.arch.lifecycle.LifecycleOwner; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -154,6 +155,7 @@ public class WifiDetailPreferenceControllerTest { private Context mContext; private Lifecycle mLifecycle; + private LifecycleOwner mLifecycleOwner; private LinkProperties mLinkProperties; private WifiDetailPreferenceController mController; @@ -214,7 +216,8 @@ public class WifiDetailPreferenceControllerTest { MockitoAnnotations.initMocks(this); mContext = spy(RuntimeEnvironment.application); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); when(mockAccessPoint.getConfig()).thenReturn(mockWifiConfig); when(mockAccessPoint.getLevel()).thenReturn(LEVEL); diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java index e8094312236..5c141ec1c2a 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java @@ -26,6 +26,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -60,12 +61,14 @@ public class WifiP2PPreferenceControllerTest { private Preference mWifiDirectPreference; private Lifecycle mLifecycle; + private LifecycleOwner mLifecycleOwner; private WifiP2pPreferenceController mController; @Before public void setUp() { MockitoAnnotations.initMocks(this); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); when(mContext.getSystemService(WifiManager.class)) .thenReturn(mWifiManager); when(mScreen.findPreference(anyString())) diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java index 2a39515e982..00d9585e4f2 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java @@ -26,6 +26,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.arch.lifecycle.LifecycleOwner; import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.Context; @@ -78,12 +79,14 @@ public class WifiTetherPreferenceControllerTest { private WifiTetherPreferenceController mController; private Lifecycle mLifecycle; + private LifecycleOwner mLifecycleOwner; private MasterSwitchPreference mPreference; @Before public void setUp() { MockitoAnnotations.initMocks(this); - mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycleOwner = () -> mLifecycle; + mLifecycle = new Lifecycle(mLifecycleOwner); FakeFeatureFactory.setupForTest(); mPreference = new MasterSwitchPreference(RuntimeEnvironment.application); when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))