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

Commit 5ce2589d authored by chelseahao's avatar chelseahao
Browse files

[Audiosharing] Clean up some tests - properly reset shadows and removed unused spy. 

Test: atest -c com.android.settings.connecteddevice.audiosharing.audiostreams
Bug: 308368124
Change-Id: If47a00ec02fbd78146483d5a409d9bcc42b5e841
parent 38236869

tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamButtonControllerTest.java

+7 −2
Original line number Diff line number Diff line
@@ -34,12 +34,12 @@ import com.android.settings.connecteddevice.audiosharing.audiostreams.testshadow 
import com.android.settings.testutils.shadow.ShadowThreadUtils;

import com.android.settingslib.widget.ActionButtonsPreference;



import org.junit.After;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.Spy;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;

import org.robolectric.RobolectricTestRunner;
@@ -59,7 +59,7 @@ public class AudioStreamButtonControllerTest { 
    @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();

    private static final String KEY = "audio_stream_button";

    private static final int BROADCAST_ID = 1;

    @Spy Context mContext = ApplicationProvider.getApplicationContext();

    private final Context mContext = ApplicationProvider.getApplicationContext();

    @Mock private AudioStreamsHelper mAudioStreamsHelper;

    @Mock private PreferenceScreen mScreen;

    @Mock private BluetoothLeBroadcastReceiveState mBroadcastReceiveState;
@@ -80,6 +80,11 @@ public class AudioStreamButtonControllerTest { 
                .thenReturn(mPreference);

    }



    @After

    public void tearDown() {

        ShadowAudioStreamsHelper.reset();

    }



    @Test

    public void testDisplayPreference_sourceConnected_setDisconnectButton() {

        when(mAudioStreamsHelper.getAllConnectedSources())

tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamHeaderControllerTest.java

+8 −2
Original line number Diff line number Diff line
@@ -34,12 +34,12 @@ import com.android.settings.testutils.shadow.ShadowThreadUtils; 
import com.android.settings.widget.EntityHeaderController;

import com.android.settingslib.widget.LayoutPreference;



import org.junit.After;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.Spy;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;

import org.robolectric.RobolectricTestRunner;
@@ -61,7 +61,7 @@ public class AudioStreamHeaderControllerTest { 
    private static final String KEY = "audio_stream_header";

    private static final int BROADCAST_ID = 1;

    private static final String BROADCAST_NAME = "broadcast name";

    @Spy Context mContext = ApplicationProvider.getApplicationContext();

    private final Context mContext = ApplicationProvider.getApplicationContext();

    @Mock private AudioStreamsHelper mAudioStreamsHelper;

    @Mock private PreferenceScreen mScreen;

    @Mock private BluetoothLeBroadcastReceiveState mBroadcastReceiveState;
@@ -81,6 +81,12 @@ public class AudioStreamHeaderControllerTest { 
        when(mPreference.getContext()).thenReturn(mContext);

    }



    @After

    public void tearDown() {

        ShadowEntityHeaderController.reset();

        ShadowAudioStreamsHelper.reset();

    }



    @Test

    public void testDisplayPreference_sourceConnected_setSummary() {

        when(mAudioStreamsHelper.getAllConnectedSources())

tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamPreferenceTest.java

+2 −3
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.view.View; 


import androidx.preference.Preference.OnPreferenceClickListener;

import androidx.preference.PreferenceViewHolder;

import androidx.test.core.app.ApplicationProvider;



import com.android.settings.R;

import com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsProgressCategoryController.AudioStreamState;
@@ -42,7 +43,6 @@ import org.mockito.Mock; 
import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;



import java.util.Collections;
@@ -53,7 +53,7 @@ public class AudioStreamPreferenceTest { 
    private static final String PROGRAM_NAME = "program_name";

    private static final int BROADCAST_RSSI = 1;

    @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();

    private Context mContext;

    private final Context mContext = ApplicationProvider.getApplicationContext();

    private AudioStreamPreference mPreference;

    @Mock private BluetoothLeBroadcastMetadata mBluetoothLeBroadcastMetadata;

    @Mock private BluetoothLeBroadcastReceiveState mBluetoothLeBroadcastReceiveState;
@@ -61,7 +61,6 @@ public class AudioStreamPreferenceTest { 


    @Before

    public void setUp() {

        mContext = RuntimeEnvironment.application;

        mPreference = new AudioStreamPreference(mContext, null);

        when(mBluetoothLeBroadcastMetadata.getBroadcastId()).thenReturn(BROADCAST_ID);

        when(mBluetoothLeBroadcastMetadata.getBroadcastName()).thenReturn(BROADCAST_NAME);

tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.content.Context; 


import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;

import androidx.test.core.app.ApplicationProvider;



import org.junit.Before;

import org.junit.Rule;
@@ -37,7 +38,6 @@ import org.mockito.Mock; 
import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;



@RunWith(RobolectricTestRunner.class)

public class AudioStreamsActiveDeviceControllerTest {
@@ -48,7 +48,7 @@ public class AudioStreamsActiveDeviceControllerTest { 


    @Before

    public void setUp() {

        Context context = RuntimeEnvironment.application;

        Context context = ApplicationProvider.getApplicationContext();

        mController =

                new AudioStreamsActiveDeviceController(

                        context, AudioStreamsActiveDeviceController.KEY);

tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceSummaryUpdaterTest.java

+7 −3
Original line number Diff line number Diff line
@@ -30,12 +30,12 @@ import com.android.settings.R; 
import com.android.settings.connecteddevice.audiosharing.audiostreams.testshadows.ShadowAudioStreamsHelper;

import com.android.settingslib.bluetooth.CachedBluetoothDevice;



import org.junit.After;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.Spy;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;

import org.robolectric.RobolectricTestRunner;
@@ -49,7 +49,7 @@ import org.robolectric.annotation.Config; 
public class AudioStreamsActiveDeviceSummaryUpdaterTest {

    @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();

    private static final String DEVICE_NAME = "device_name";

    @Spy private final Context mContext = ApplicationProvider.getApplicationContext();

    private final Context mContext = ApplicationProvider.getApplicationContext();

    private final AudioStreamsActiveDeviceSummaryUpdater.OnSummaryChangeListener mFakeListener =

            summary -> mUpdatedSummary = summary;

    @Mock private CachedBluetoothDevice mCachedBluetoothDevice;
@@ -60,10 +60,14 @@ public class AudioStreamsActiveDeviceSummaryUpdaterTest { 
    @Before

    public void setUp() {

        ShadowAudioStreamsHelper.setUseMock(mAudioStreamsHelper);

        ShadowAudioStreamsHelper.resetCachedBluetoothDevice();

        mUpdater = new AudioStreamsActiveDeviceSummaryUpdater(mContext, mFakeListener);

    }



    @After

    public void tearDown() {

        ShadowAudioStreamsHelper.reset();

    }



    @Test

    public void register_summaryUpdated() {

        mUpdater.register(true);