Fix ConnectedDeviceDashboardFragmentTest.

Bug: 313362757
Test: atest
Change-Id: I9af41b0842880744e4b0c5864db08a9ddd5d7a13
This commit is contained in:
Yiyi Shen
2023-11-28 17:53:42 +08:00
parent 8437e1a64b
commit 5a7d1cbd0c

View File

@@ -25,18 +25,23 @@ import static org.mockito.Mockito.spy;
import android.content.Context; import android.content.Context;
import android.content.pm.PackageManager; 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 android.provider.SearchIndexableResource;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerListHelper; import com.android.settings.core.PreferenceControllerListHelper;
import com.android.settings.flags.Flags;
import com.android.settings.slices.SlicePreferenceController; import com.android.settings.slices.SlicePreferenceController;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
import com.android.settings.testutils.shadow.ShadowConnectivityManager; import com.android.settings.testutils.shadow.ShadowConnectivityManager;
import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.testutils.shadow.ShadowUserManager;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
@@ -51,11 +56,13 @@ import java.util.List;
@Config(shadows = {ShadowUserManager.class, @Config(shadows = {ShadowUserManager.class,
ShadowConnectivityManager.class, ShadowBluetoothAdapter.class}) ShadowConnectivityManager.class, ShadowBluetoothAdapter.class})
public class ConnectedDeviceDashboardFragmentTest { 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_NEARBY_DEVICES = "bt_nearby_slice";
private static final String KEY_DISCOVERABLE_FOOTER = "discoverable_footer"; 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_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_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_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_DEVICE_LIST = "audio_sharing_device_list";
private static final String KEY_AUDIO_SHARING_SETTINGS = 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_APP_NAME = "com.testapp.settings";
private static final String TEST_ACTION = "com.testapp.settings.ACTION_START"; private static final String TEST_ACTION = "com.testapp.settings.ACTION_START";
@Mock private PackageManager mPackageManager;
@Mock
private PackageManager mPackageManager;
private Context mContext; private Context mContext;
private ConnectedDeviceDashboardFragment mFragment; private ConnectedDeviceDashboardFragment mFragment;
@@ -85,18 +90,37 @@ public class ConnectedDeviceDashboardFragmentTest {
@Test @Test
public void searchIndexProvider_shouldIndexResource() { public void searchIndexProvider_shouldIndexResource() {
final List<SearchIndexableResource> indexRes = final List<SearchIndexableResource> indexRes =
ConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER ConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
.getXmlResourcesToIndex(mContext, true /* enabled */); mContext, true /* enabled */);
assertThat(indexRes).isNotNull(); assertThat(indexRes).isNotNull();
assertThat(indexRes.get(0).xmlResId).isEqualTo(R.xml.connected_devices); assertThat(indexRes.get(0).xmlResId).isEqualTo(R.xml.connected_devices);
} }
@Ignore("b/313362757")
@Test @Test
@RequiresFlagsEnabled(Flags.FLAG_ENABLE_LE_AUDIO_SHARING)
public void nonIndexableKeys_existInXmlLayout() { public void nonIndexableKeys_existInXmlLayout() {
final List<String> niks = ConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER final List<String> niks =
.getNonIndexableKeys(mContext); 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<String> niks =
ConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
mContext);
assertThat(niks) assertThat(niks)
.containsExactly( .containsExactly(
@@ -106,7 +130,6 @@ public class ConnectedDeviceDashboardFragmentTest {
KEY_DISCOVERABLE_FOOTER, KEY_DISCOVERABLE_FOOTER,
KEY_SAVED_DEVICE_SEE_ALL, KEY_SAVED_DEVICE_SEE_ALL,
KEY_FAST_PAIR_DEVICE_SEE_ALL, KEY_FAST_PAIR_DEVICE_SEE_ALL,
KEY_FAST_PAIR_DEVICE_LIST,
KEY_AUDIO_SHARING_DEVICE_LIST, KEY_AUDIO_SHARING_DEVICE_LIST,
KEY_AUDIO_SHARING_SETTINGS); KEY_AUDIO_SHARING_SETTINGS);
} }
@@ -134,8 +157,8 @@ public class ConnectedDeviceDashboardFragmentTest {
@Test @Test
public void getPreferenceControllers_containSlicePrefController() { public void getPreferenceControllers_containSlicePrefController() {
final List<BasePreferenceController> controllers = final List<BasePreferenceController> controllers =
PreferenceControllerListHelper.getPreferenceControllersFromXml(mContext, PreferenceControllerListHelper.getPreferenceControllersFromXml(
R.xml.connected_devices); mContext, R.xml.connected_devices);
assertThat(controllers assertThat(controllers
.stream() .stream()