From 5a7d1cbd0cb0b1331a4f028b38bfbeeb81c2b337 Mon Sep 17 00:00:00 2001 From: Yiyi Shen Date: Tue, 28 Nov 2023 17:53:42 +0800 Subject: [PATCH] Fix ConnectedDeviceDashboardFragmentTest. Bug: 313362757 Test: atest Change-Id: I9af41b0842880744e4b0c5864db08a9ddd5d7a13 --- .../ConnectedDeviceDashboardFragmentTest.java | 49 ++++++++++++++----- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java index 5635b859fa1..a3348cac85d 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java @@ -25,18 +25,23 @@ 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; 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; import com.android.settings.testutils.shadow.ShadowUserManager; import org.junit.Before; -import org.junit.Ignore; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -51,11 +56,13 @@ import java.util.List; @Config(shadows = {ShadowUserManager.class, ShadowConnectivityManager.class, ShadowBluetoothAdapter.class}) public class ConnectedDeviceDashboardFragmentTest { + @Rule + public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule(); + private static final String KEY_NEARBY_DEVICES = "bt_nearby_slice"; private static final String KEY_DISCOVERABLE_FOOTER = "discoverable_footer"; private static final String KEY_SAVED_DEVICE_SEE_ALL = "previously_connected_devices_see_all"; private static final String KEY_FAST_PAIR_DEVICE_SEE_ALL = "fast_pair_devices_see_all"; - private static final String KEY_FAST_PAIR_DEVICE_LIST = "fast_pair_devices"; private static final String KEY_ADD_BT_DEVICES = "add_bt_devices"; private static final String KEY_AUDIO_SHARING_DEVICE_LIST = "audio_sharing_device_list"; private static final String KEY_AUDIO_SHARING_SETTINGS = @@ -66,9 +73,7 @@ public class ConnectedDeviceDashboardFragmentTest { private static final String TEST_APP_NAME = "com.testapp.settings"; private static final String TEST_ACTION = "com.testapp.settings.ACTION_START"; - - @Mock - private PackageManager mPackageManager; + @Mock private PackageManager mPackageManager; private Context mContext; private ConnectedDeviceDashboardFragment mFragment; @@ -85,18 +90,37 @@ public class ConnectedDeviceDashboardFragmentTest { @Test public void searchIndexProvider_shouldIndexResource() { final List indexRes = - ConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER - .getXmlResourcesToIndex(mContext, true /* enabled */); + ConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex( + mContext, true /* enabled */); assertThat(indexRes).isNotNull(); assertThat(indexRes.get(0).xmlResId).isEqualTo(R.xml.connected_devices); } - @Ignore("b/313362757") @Test + @RequiresFlagsEnabled(Flags.FLAG_ENABLE_LE_AUDIO_SHARING) public void nonIndexableKeys_existInXmlLayout() { - final List niks = ConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER - .getNonIndexableKeys(mContext); + 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( @@ -106,7 +130,6 @@ public class ConnectedDeviceDashboardFragmentTest { KEY_DISCOVERABLE_FOOTER, KEY_SAVED_DEVICE_SEE_ALL, KEY_FAST_PAIR_DEVICE_SEE_ALL, - KEY_FAST_PAIR_DEVICE_LIST, KEY_AUDIO_SHARING_DEVICE_LIST, KEY_AUDIO_SHARING_SETTINGS); } @@ -134,8 +157,8 @@ public class ConnectedDeviceDashboardFragmentTest { @Test public void getPreferenceControllers_containSlicePrefController() { final List controllers = - PreferenceControllerListHelper.getPreferenceControllersFromXml(mContext, - R.xml.connected_devices); + PreferenceControllerListHelper.getPreferenceControllersFromXml( + mContext, R.xml.connected_devices); assertThat(controllers .stream()