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

Clean up unnecessary spy context statements

Browse Source 
Remove spy context syntax because we do not need to
mock context anymore in the test cases.

Bug: 117644158
Test: robotests
Change-Id: I222eec4fbc1994d7bb79adead40b76ac0a000bdc
This commit is contained in:
Mill Chen
2018-10-12 21:39:04 +08:00
parent 5331355163
commit 2559f02d68
11 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java
View File

@@ -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);

4
tests/robotests/src/com/android/settings/flashlight/FlashlightSliceBuilderTest.java
View File

@@ -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);

2
tests/robotests/src/com/android/settings/homepage/deviceinfo/DataUsageSliceTest.java
View File

@@ -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);

2
tests/robotests/src/com/android/settings/homepage/deviceinfo/DeviceInfoSliceTest.java
View File

@@ -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);

4
tests/robotests/src/com/android/settings/homepage/deviceinfo/StorageSliceTest.java
View File

@@ -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);

4
tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java
View File

@@ -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);

2
tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java
View File

@@ -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();

4
tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java
View File

@@ -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);

2
tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
View File

@@ -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);

4
tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java
View File

@@ -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);

2
tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java
View File

@@ -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());