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

Commit f3e693d7 authored by Yiyi Shen's avatar Yiyi Shen Committed by Android (Google) Code Review
Browse files

Merge "[Audiosharing] Fix test." into main

parents e96900d1 bdb66db5

tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogFragmentTest.java

+1 −6
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import com.android.settings.flags.Flags; 
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;

import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;



import org.junit.After;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;
@@ -85,6 +84,7 @@ public class AudioSharingDialogFragmentTest { 


    @Before

    public void setUp() {

        ShadowAlertDialogCompat.reset();

        mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());

        mShadowBluetoothAdapter.setEnabled(true);

        mShadowBluetoothAdapter.setIsLeAudioBroadcastSourceSupported(
@@ -97,11 +97,6 @@ public class AudioSharingDialogFragmentTest { 
                mParent, FragmentActivity.class, /* containerViewId= */ 0, /* bundle= */ null);

    }



    @After

    public void tearDown() {

        ShadowAlertDialogCompat.reset();

    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_ENABLE_LE_AUDIO_SHARING)

    public void onCreateDialog_flagOff_dialogNotExist() {

tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDisconnectDialogFragmentTest.java

+2 −7
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import com.android.settings.flags.Flags; 
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;

import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;



import org.junit.After;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;
@@ -79,6 +78,7 @@ public class AudioSharingDisconnectDialogFragmentTest { 


    @Before

    public void setUp() {

        ShadowAlertDialogCompat.reset();

        mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());

        mShadowBluetoothAdapter.setEnabled(true);

        mShadowBluetoothAdapter.setIsLeAudioBroadcastSourceSupported(
@@ -96,16 +96,11 @@ public class AudioSharingDisconnectDialogFragmentTest { 
        shadowMainLooper().idle();

    }



    @After

    public void tearDown() {

        ShadowAlertDialogCompat.reset();

    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_ENABLE_LE_AUDIO_SHARING)

    public void onCreateDialog_flagOff_dialogNotExist() {

        AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();

        assertThat(dialog).isNotNull();

        assertThat(dialog).isNull();

    }



    @Test

tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinDialogFragmentTest.java

+1 −6
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import com.android.settings.flags.Flags; 
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;

import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;



import org.junit.After;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;
@@ -77,6 +76,7 @@ public class AudioSharingJoinDialogFragmentTest { 


    @Before

    public void setUp() {

        ShadowAlertDialogCompat.reset();

        mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());

        mShadowBluetoothAdapter.setEnabled(true);

        mShadowBluetoothAdapter.setIsLeAudioBroadcastSourceSupported(
@@ -89,11 +89,6 @@ public class AudioSharingJoinDialogFragmentTest { 
                mParent, FragmentActivity.class, /* containerViewId= */ 0, /* bundle= */ null);

    }



    @After

    public void tearDown() {

        ShadowAlertDialogCompat.reset();

    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_ENABLE_LE_AUDIO_SHARING)

    public void onCreateDialog_flagOff_dialogNotExist() {

tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingStopDialogFragmentTest.java

+1 −6
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import com.android.settings.flags.Flags; 
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;

import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;



import org.junit.After;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;
@@ -70,6 +69,7 @@ public class AudioSharingStopDialogFragmentTest { 


    @Before

    public void setUp() {

        ShadowAlertDialogCompat.reset();

        mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());

        mShadowBluetoothAdapter.setEnabled(true);

        mShadowBluetoothAdapter.setIsLeAudioBroadcastSourceSupported(
@@ -82,11 +82,6 @@ public class AudioSharingStopDialogFragmentTest { 
                mParent, FragmentActivity.class, /* containerViewId= */ 0, /* bundle= */ null);

    }



    @After

    public void tearDown() {

        ShadowAlertDialogCompat.reset();

    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_ENABLE_LE_AUDIO_SHARING)

    public void onCreateDialog_flagOff_dialogNotExist() {