diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java index faab3bd39a3..369d2227dad 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java @@ -19,8 +19,6 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.spy; - import android.bluetooth.BluetoothAdapter; import android.content.Context; import android.content.Intent; @@ -56,7 +54,7 @@ public class BluetoothSliceBuilderTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - mContext = spy(RuntimeEnvironment.application); + mContext = RuntimeEnvironment.application; // Set-up specs for SliceMetadata. SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS); diff --git a/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceBuilderTest.java b/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceBuilderTest.java index 6bea0312a71..56a84bb08e2 100644 --- a/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceBuilderTest.java @@ -19,8 +19,6 @@ package com.android.settings.flashlight; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.spy; - import android.content.Context; import android.provider.Settings; @@ -50,7 +48,7 @@ public class FlashlightSliceBuilderTest { @Before public void setUp() { - mContext = spy(RuntimeEnvironment.application); + mContext = RuntimeEnvironment.application; // Set-up specs for SliceMetadata. SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS); diff --git a/tests/robotests/src/com/android/settings/homepage/deviceinfo/DataUsageSliceTest.java b/tests/robotests/src/com/android/settings/homepage/deviceinfo/DataUsageSliceTest.java index c0af3d811dc..9993369953e 100644 --- a/tests/robotests/src/com/android/settings/homepage/deviceinfo/DataUsageSliceTest.java +++ b/tests/robotests/src/com/android/settings/homepage/deviceinfo/DataUsageSliceTest.java @@ -56,7 +56,7 @@ public class DataUsageSliceTest { @Before public void setUp() { - mContext = spy(RuntimeEnvironment.application); + mContext = RuntimeEnvironment.application; // Set-up specs for SliceMetadata. SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS); diff --git a/tests/robotests/src/com/android/settings/homepage/deviceinfo/DeviceInfoSliceTest.java b/tests/robotests/src/com/android/settings/homepage/deviceinfo/DeviceInfoSliceTest.java index 2480bafa0e4..58a72202bff 100644 --- a/tests/robotests/src/com/android/settings/homepage/deviceinfo/DeviceInfoSliceTest.java +++ b/tests/robotests/src/com/android/settings/homepage/deviceinfo/DeviceInfoSliceTest.java @@ -57,7 +57,7 @@ public class DeviceInfoSliceTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - mContext = spy(RuntimeEnvironment.application); + mContext = RuntimeEnvironment.application; // Set-up specs for SliceMetadata. SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS); diff --git a/tests/robotests/src/com/android/settings/homepage/deviceinfo/StorageSliceTest.java b/tests/robotests/src/com/android/settings/homepage/deviceinfo/StorageSliceTest.java index 5609a7a1e84..effc8da9a51 100644 --- a/tests/robotests/src/com/android/settings/homepage/deviceinfo/StorageSliceTest.java +++ b/tests/robotests/src/com/android/settings/homepage/deviceinfo/StorageSliceTest.java @@ -19,12 +19,10 @@ package com.android.settings.homepage.deviceinfo; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import android.content.Context; -import android.content.res.Resources; import androidx.core.graphics.drawable.IconCompat; import androidx.slice.Slice; @@ -56,7 +54,7 @@ public class StorageSliceTest { @Before public void setUp() { - mContext = spy(RuntimeEnvironment.application); + mContext = RuntimeEnvironment.application; // Set-up specs for SliceMetadata. SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS); diff --git a/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java b/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java index 90222caf2b1..ecbf858095a 100644 --- a/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java @@ -2,8 +2,6 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.spy; - import android.content.Context; import androidx.core.graphics.drawable.IconCompat; @@ -32,7 +30,7 @@ public class LocationSliceBuilderTest { @Before public void setUp() { - mContext = spy(RuntimeEnvironment.application); + mContext = RuntimeEnvironment.application; // Set-up specs for SliceMetadata. SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS); diff --git a/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java b/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java index 9b6d563a597..d260a9781bc 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java @@ -79,7 +79,7 @@ public class Enhanced4gLteSliceHelperTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - mContext = spy(RuntimeEnvironment.application); + mContext = RuntimeEnvironment.application; mFeatureFactory = FakeFeatureFactory.setupForTest(); mSlicesFeatureProvider = mFeatureFactory.getSlicesFeatureProvider(); diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java index 6c43736b816..ee513170611 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java @@ -20,8 +20,6 @@ import static android.app.slice.Slice.EXTRA_TOGGLE_STATE; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.spy; - import android.app.NotificationManager; import android.content.Context; import android.content.Intent; @@ -55,7 +53,7 @@ public class ZenModeSliceBuilderTest { @Before public void setUp() { - mContext = spy(RuntimeEnvironment.application); + mContext = RuntimeEnvironment.application; // Set-up specs for SliceMetadata. SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS); diff --git a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java index 078186af6c8..f9cc427e6c8 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java @@ -79,7 +79,7 @@ public class SliceBuilderUtilsTest { @Before public void setUp() { - mContext = spy(RuntimeEnvironment.application); + mContext = RuntimeEnvironment.application; mFeatureFactory = FakeFeatureFactory.setupForTest(); mLoggingArgumentCatpor = ArgumentCaptor.forClass(Pair.class); diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java index 5a2f546236d..742c8ad0a36 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java @@ -19,8 +19,6 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.spy; - import android.content.Context; import android.content.Intent; import android.net.wifi.WifiManager; @@ -53,7 +51,7 @@ public class WifiSliceTest { @Before public void setUp() { - mContext = spy(RuntimeEnvironment.application); + mContext = RuntimeEnvironment.application; // Set-up specs for SliceMetadata. SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS); diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java index c5c4b672ca5..ae4c7533bbf 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java @@ -86,7 +86,7 @@ public class WifiCallingSliceHelperTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - mContext = spy(RuntimeEnvironment.application); + mContext = RuntimeEnvironment.application; //setup for SettingsSliceProvider tests mProvider = spy(new SettingsSliceProvider());