Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f324c94 authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Remove mocked resources from slice test cases"

parents 585ab749 fdf06e24

tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java

+1 −9
Original line number Diff line number Diff line
@@ -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);

    }

tests/robotests/src/com/android/settings/flashlight/FlashlightSliceBuilderTest.java

+0 −8
Original line number Diff line number Diff line
@@ -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);

    }

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

+0 −7
Original line number Diff line number Diff line
@@ -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);

tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java

+0 −8
Original line number Diff line number Diff line
@@ -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);

    }

tests/robotests/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelperTest.java

+0 −7
Original line number Diff line number Diff line
@@ -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.