From fdf06e242abf774da3dfab6b11cb1d3dfccaea07 Mon Sep 17 00:00:00 2001 From: Mill Chen Date: Tue, 9 Oct 2018 23:25:44 +0800 Subject: [PATCH] Remove mocked resources from slice test cases Clean up some resources which are useless for the moment. Bug: 117485451 Test: robotests Change-Id: Id3591178791cc6c9f628a99a8916e9007a399728 --- .../settings/bluetooth/BluetoothSliceBuilderTest.java | 10 +--------- .../flashlight/FlashlightSliceBuilderTest.java | 8 -------- .../homepage/deviceinfo/DataUsageSliceTest.java | 7 ------- .../settings/location/LocationSliceBuilderTest.java | 8 -------- .../mobilenetwork/Enhanced4gLteSliceHelperTest.java | 7 ------- .../settings/notification/ZenModeSliceBuilderTest.java | 8 -------- .../android/settings/slices/SliceBuilderUtilsTest.java | 7 ------- .../src/com/android/settings/wifi/WifiSliceTest.java | 8 -------- .../wifi/calling/WifiCallingSliceHelperTest.java | 7 ------- 9 files changed, 1 insertion(+), 69 deletions(-) diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java index bfbdd7f78a4..faab3bd39a3 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java @@ -19,14 +19,11 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import android.bluetooth.BluetoothAdapter; import android.content.Context; import android.content.Intent; -import android.content.res.Resources; import androidx.core.graphics.drawable.IconCompat; import androidx.slice.Slice; @@ -61,11 +58,6 @@ public class BluetoothSliceBuilderTest { MockitoAnnotations.initMocks(this); mContext = spy(RuntimeEnvironment.application); - // Prevent crash in SliceMetadata. - Resources resources = spy(mContext.getResources()); - doReturn(60).when(resources).getDimensionPixelSize(anyInt()); - doReturn(resources).when(mContext).getResources(); - // Set-up specs for SliceMetadata. SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS); } @@ -98,4 +90,4 @@ public class BluetoothSliceBuilderTest { assertThat(adapter.isEnabled()).isTrue(); } -} \ No newline at end of file +} diff --git a/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceBuilderTest.java b/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceBuilderTest.java index 07296e652c5..6bea0312a71 100644 --- a/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceBuilderTest.java @@ -19,12 +19,9 @@ package com.android.settings.flashlight; import static com.google.common.truth.Truth.assertThat; -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 android.provider.Settings; import androidx.slice.Slice; @@ -55,11 +52,6 @@ public class FlashlightSliceBuilderTest { public void setUp() { mContext = spy(RuntimeEnvironment.application); - // Prevent crash in SliceMetadata. - Resources resources = spy(mContext.getResources()); - doReturn(60).when(resources).getDimensionPixelSize(anyInt()); - doReturn(resources).when(mContext).getResources(); - // 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 c03070c5363..c0af3d811dc 100644 --- a/tests/robotests/src/com/android/settings/homepage/deviceinfo/DataUsageSliceTest.java +++ b/tests/robotests/src/com/android/settings/homepage/deviceinfo/DataUsageSliceTest.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; @@ -60,11 +58,6 @@ public class DataUsageSliceTest { public void setUp() { mContext = spy(RuntimeEnvironment.application); - // Prevent crash in SliceMetadata. - Resources resources = spy(mContext.getResources()); - doReturn(60).when(resources).getDimensionPixelSize(anyInt()); - doReturn(resources).when(mContext).getResources(); - // 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 65b2e878d6a..90222caf2b1 100644 --- a/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java @@ -2,12 +2,9 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; -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; @@ -37,11 +34,6 @@ public class LocationSliceBuilderTest { public void setUp() { mContext = spy(RuntimeEnvironment.application); - // Prevent crash in SliceMetadata. - Resources resources = spy(mContext.getResources()); - doReturn(60).when(resources).getDimensionPixelSize(anyInt()); - doReturn(resources).when(mContext).getResources(); - // Set-up specs for SliceMetadata. SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS); } diff --git a/tests/robotests/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelperTest.java b/tests/robotests/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelperTest.java index 6d983816040..1943b3630ac 100644 --- a/tests/robotests/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelperTest.java +++ b/tests/robotests/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelperTest.java @@ -23,7 +23,6 @@ import static android.app.slice.SliceItem.FORMAT_TEXT; 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 static org.mockito.Mockito.verify; @@ -32,7 +31,6 @@ import static org.mockito.Mockito.when; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; -import android.content.res.Resources; import android.telephony.CarrierConfigManager; import androidx.slice.Slice; @@ -98,11 +96,6 @@ public class Enhanced4gLteSliceHelperTest { //setup for SliceBroadcastReceiver test mReceiver = spy(new SliceBroadcastReceiver()); - // Prevent crash in SliceMetadata. - Resources resources = spy(mContext.getResources()); - doReturn(60).when(resources).getDimensionPixelSize(anyInt()); - doReturn(resources).when(mContext).getResources(); - mEnhanced4gLteSliceHelper = new FakeEnhanced4gLteSliceHelper(mContext); // Set-up specs for SliceMetadata. diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java index bfc5c428f05..6c43736b816 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java @@ -20,14 +20,11 @@ import static android.app.slice.Slice.EXTRA_TOGGLE_STATE; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import android.app.NotificationManager; import android.content.Context; import android.content.Intent; -import android.content.res.Resources; import android.provider.Settings; import androidx.slice.Slice; @@ -60,11 +57,6 @@ public class ZenModeSliceBuilderTest { public void setUp() { mContext = spy(RuntimeEnvironment.application); - // Prevent crash in SliceMetadata. - Resources resources = spy(mContext.getResources()); - doReturn(60).when(resources).getDimensionPixelSize(anyInt()); - doReturn(resources).when(mContext).getResources(); - // 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 16e9cb737a5..078186af6c8 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java @@ -18,7 +18,6 @@ package com.android.settings.slices; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -27,7 +26,6 @@ import static org.mockito.Mockito.verify; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; -import android.content.res.Resources; import android.net.Uri; import android.provider.Settings; import android.provider.SettingsSlicesContract; @@ -85,11 +83,6 @@ public class SliceBuilderUtilsTest { mFeatureFactory = FakeFeatureFactory.setupForTest(); mLoggingArgumentCatpor = ArgumentCaptor.forClass(Pair.class); - // Prevent crash in SliceMetadata. - Resources resources = spy(mContext.getResources()); - doReturn(60).when(resources).getDimensionPixelSize(anyInt()); - doReturn(resources).when(mContext).getResources(); - // Set-up specs for SliceMetadata. SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS); } diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java index dda5d8fc8f9..5a2f546236d 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java @@ -19,13 +19,10 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; -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.Intent; -import android.content.res.Resources; import android.net.wifi.WifiManager; import androidx.core.graphics.drawable.IconCompat; @@ -58,11 +55,6 @@ public class WifiSliceTest { public void setUp() { mContext = spy(RuntimeEnvironment.application); - // Prevent crash in SliceMetadata. - Resources resources = spy(mContext.getResources()); - doReturn(60).when(resources).getDimensionPixelSize(anyInt()); - doReturn(resources).when(mContext).getResources(); - // 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 7e8771188c7..c5c4b672ca5 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java @@ -23,7 +23,6 @@ import static android.app.slice.SliceItem.FORMAT_TEXT; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -33,7 +32,6 @@ import static org.mockito.Mockito.when; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; -import android.content.res.Resources; import android.telephony.CarrierConfigManager; import androidx.slice.Slice; @@ -104,11 +102,6 @@ public class WifiCallingSliceHelperTest { when(mSlicesFeatureProvider.getCustomSliceManager(any(Context.class))) .thenReturn(manager); - // Prevent crash in SliceMetadata. - Resources resources = spy(mContext.getResources()); - doReturn(60).when(resources).getDimensionPixelSize(anyInt()); - doReturn(resources).when(mContext).getResources(); - mWfcSliceHelper = new FakeWifiCallingSliceHelper(mContext); // Set-up specs for SliceMetadata.