From 769f9ae45e4c044ed77dbd216085e8802aee9b6d Mon Sep 17 00:00:00 2001 From: Yiyi Shen Date: Fri, 2 Feb 2024 16:04:09 +0800 Subject: [PATCH] [Audiosharing] Fix tests when flag is on. Test: atest Bug: 305620450 Change-Id: I85e8be4aef84a550bd4fe556848f3627b0f29fa6 --- .../ConnectedDeviceDashboardFragmentTest.java | 40 ++++++------------- .../AudioSharingDialogFragmentTest.java | 8 +++- .../AudioSharingSwitchBarControllerTest.java | 4 +- 3 files changed, 20 insertions(+), 32 deletions(-) diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java index a3348cac85d..09f7a384244 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java @@ -25,8 +25,6 @@ import static org.mockito.Mockito.spy; import android.content.Context; import android.content.pm.PackageManager; -import android.platform.test.annotations.RequiresFlagsDisabled; -import android.platform.test.annotations.RequiresFlagsEnabled; import android.platform.test.flag.junit.CheckFlagsRule; import android.platform.test.flag.junit.DeviceFlagsValueProvider; import android.provider.SearchIndexableResource; @@ -34,7 +32,6 @@ import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.PreferenceControllerListHelper; -import com.android.settings.flags.Flags; import com.android.settings.slices.SlicePreferenceController; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.testutils.shadow.ShadowConnectivityManager; @@ -53,8 +50,12 @@ import org.robolectric.annotation.Config; import java.util.List; @RunWith(RobolectricTestRunner.class) -@Config(shadows = {ShadowUserManager.class, - ShadowConnectivityManager.class, ShadowBluetoothAdapter.class}) +@Config( + shadows = { + ShadowUserManager.class, + ShadowConnectivityManager.class, + ShadowBluetoothAdapter.class + }) public class ConnectedDeviceDashboardFragmentTest { @Rule public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule(); @@ -98,30 +99,11 @@ public class ConnectedDeviceDashboardFragmentTest { } @Test - @RequiresFlagsEnabled(Flags.FLAG_ENABLE_LE_AUDIO_SHARING) public void nonIndexableKeys_existInXmlLayout() { final List niks = ConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys( mContext); - assertThat(niks) - .containsExactly( - KEY_CONNECTED_DEVICES, - KEY_AVAILABLE_DEVICES, - KEY_NEARBY_DEVICES, - KEY_DISCOVERABLE_FOOTER, - KEY_SAVED_DEVICE_SEE_ALL, - KEY_FAST_PAIR_DEVICE_SEE_ALL, - KEY_AUDIO_SHARING_SETTINGS); - } - - @Test - @RequiresFlagsDisabled(Flags.FLAG_ENABLE_LE_AUDIO_SHARING) - public void nonIndexableKeys_existInXmlLayout_flagOff() { - final List niks = - ConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys( - mContext); - assertThat(niks) .containsExactly( KEY_CONNECTED_DEVICES, @@ -160,10 +142,12 @@ public class ConnectedDeviceDashboardFragmentTest { PreferenceControllerListHelper.getPreferenceControllersFromXml( mContext, R.xml.connected_devices); - assertThat(controllers - .stream() - .filter(controller -> controller instanceof SlicePreferenceController) - .count()) + assertThat( + controllers.stream() + .filter( + controller -> + controller instanceof SlicePreferenceController) + .count()) .isEqualTo(1); } } diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogFragmentTest.java index fa6cc6cd3a8..757964b5d82 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogFragmentTest.java @@ -158,7 +158,9 @@ public class AudioSharingDialogFragmentTest { @Test @RequiresFlagsEnabled(Flags.FLAG_ENABLE_LE_AUDIO_SHARING) public void onCreateDialog_singleConnectedDevice_dialogDismiss() { - mFragment.show(mParent, new ArrayList<>(), (item) -> {}); + ArrayList list = new ArrayList<>(); + list.add(TEST_DEVICE_ITEM1); + mFragment.show(mParent, list, (item) -> {}); shadowMainLooper().idle(); AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog(); ShadowAlertDialogCompat shadowDialog = ShadowAlertDialogCompat.shadowOf(dialog); @@ -170,10 +172,12 @@ public class AudioSharingDialogFragmentTest { @Test @RequiresFlagsEnabled(Flags.FLAG_ENABLE_LE_AUDIO_SHARING) public void onCreateDialog_singleConnectedDevice_shareClicked() { + ArrayList list = new ArrayList<>(); + list.add(TEST_DEVICE_ITEM1); AtomicBoolean isShareBtnClicked = new AtomicBoolean(false); mFragment.show( mParent, - new ArrayList<>(), + list, (item) -> { isShareBtnClicked.set(true); }); diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarControllerTest.java index 0b9406124e7..11e8ec9e21d 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarControllerTest.java @@ -18,7 +18,6 @@ package com.android.settings.connecteddevice.audiosharing; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.verify; import static org.robolectric.Shadows.shadowOf; import android.bluetooth.BluetoothAdapter; @@ -71,6 +70,7 @@ public class AudioSharingSwitchBarControllerTest { @Test @RequiresFlagsEnabled(Flags.FLAG_ENABLE_LE_AUDIO_SHARING) public void bluetoothOff_switchDisabled() { + assertThat(mSwitchBar.isEnabled()).isTrue(); mContext.registerReceiver( mController.mReceiver, mController.mIntentFilter, @@ -79,7 +79,7 @@ public class AudioSharingSwitchBarControllerTest { intent.putExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.STATE_OFF); mContext.sendBroadcast(intent); shadowOf(Looper.getMainLooper()).idle(); - verify(mSwitch).setEnabled(false); + assertThat(mSwitchBar.isEnabled()).isFalse(); assertThat(mOnSwitchBarChanged).isTrue(); } }