Remove all reference to SmsMirroring in Android Settings.
Test: Robotests Change-Id: I3318c6915cae95522f09838f00a3c567fe9e5fc5
This commit is contained in:
@@ -53,37 +53,15 @@ public class AdvancedConnectedDeviceDashboardFragmentTest {
|
||||
private PackageManager mManager;
|
||||
|
||||
private FakeFeatureFactory mFeatureFactory;
|
||||
private SmsMirroringFeatureProvider mFeatureProvider;
|
||||
private AdvancedConnectedDeviceDashboardFragment mFragment;
|
||||
private TestSmsMirroringPreferenceController mSmsMirroringPreferenceController;
|
||||
|
||||
private static final class TestSmsMirroringPreferenceController
|
||||
extends SmsMirroringPreferenceController implements PreferenceControllerMixin {
|
||||
|
||||
private boolean mIsAvailable;
|
||||
|
||||
public TestSmsMirroringPreferenceController(Context context) {
|
||||
super(context);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAvailable() {
|
||||
return mIsAvailable;
|
||||
}
|
||||
}
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mFeatureFactory = FakeFeatureFactory.setupForTest();
|
||||
mFeatureProvider = mFeatureFactory.smsMirroringFeatureProvider;
|
||||
|
||||
mFragment = new AdvancedConnectedDeviceDashboardFragment();
|
||||
when(mContext.getPackageManager()).thenReturn(mManager);
|
||||
|
||||
mSmsMirroringPreferenceController = new TestSmsMirroringPreferenceController(mContext);
|
||||
when(mFeatureProvider.getController(mContext)).thenReturn(
|
||||
mSmsMirroringPreferenceController);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -123,30 +101,6 @@ public class AdvancedConnectedDeviceDashboardFragmentTest {
|
||||
assertThat(keys).doesNotContain(NfcPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSearchIndexProvider_NoSmsMirroring_KeyAdded() {
|
||||
when(mFeatureProvider.shouldShowSmsMirroring(mContext)).thenReturn(false);
|
||||
mSmsMirroringPreferenceController.mIsAvailable = false;
|
||||
|
||||
final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
|
||||
mContext);
|
||||
|
||||
assertThat(keys).isNotNull();
|
||||
assertThat(keys).contains(mSmsMirroringPreferenceController.getPreferenceKey());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSearchIndexProvider_SmsMirroring_KeyNotAdded() {
|
||||
when(mFeatureProvider.shouldShowSmsMirroring(mContext)).thenReturn(true);
|
||||
mSmsMirroringPreferenceController.mIsAvailable = true;
|
||||
|
||||
final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
|
||||
mContext);
|
||||
|
||||
assertThat(keys).isNotNull();
|
||||
assertThat(keys).doesNotContain(mSmsMirroringPreferenceController.getPreferenceKey());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetCategoryKey_returnCategoryDevice() {
|
||||
assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_DEVICE);
|
||||
|
@@ -60,37 +60,15 @@ public class ConnectedDeviceDashboardFragment2Test {
|
||||
private PackageManager mManager;
|
||||
|
||||
private FakeFeatureFactory mFeatureFactory;
|
||||
private SmsMirroringFeatureProvider mFeatureProvider;
|
||||
private ConnectedDeviceDashboardFragmentOld mFragment;
|
||||
private TestSmsMirroringPreferenceController mSmsMirroringPreferenceController;
|
||||
|
||||
private static final class TestSmsMirroringPreferenceController
|
||||
extends SmsMirroringPreferenceController implements PreferenceControllerMixin {
|
||||
|
||||
private boolean mIsAvailable;
|
||||
|
||||
public TestSmsMirroringPreferenceController(Context context) {
|
||||
super(context);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAvailable() {
|
||||
return mIsAvailable;
|
||||
}
|
||||
}
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mFeatureFactory = FakeFeatureFactory.setupForTest();
|
||||
mFeatureProvider = mFeatureFactory.smsMirroringFeatureProvider;
|
||||
|
||||
mFragment = new ConnectedDeviceDashboardFragmentOld();
|
||||
when(mContext.getPackageManager()).thenReturn(mManager);
|
||||
|
||||
mSmsMirroringPreferenceController = new TestSmsMirroringPreferenceController(mContext);
|
||||
when(mFeatureProvider.getController(mContext)).thenReturn(
|
||||
mSmsMirroringPreferenceController);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -130,30 +108,6 @@ public class ConnectedDeviceDashboardFragment2Test {
|
||||
assertThat(keys).doesNotContain(NfcPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSearchIndexProvider_NoSmsMirroring_KeyAdded() {
|
||||
when(mFeatureProvider.shouldShowSmsMirroring(mContext)).thenReturn(false);
|
||||
mSmsMirroringPreferenceController.mIsAvailable = false;
|
||||
|
||||
final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
|
||||
mContext);
|
||||
|
||||
assertThat(keys).isNotNull();
|
||||
assertThat(keys).contains(mSmsMirroringPreferenceController.getPreferenceKey());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSearchIndexProvider_SmsMirroring_KeyNotAdded() {
|
||||
when(mFeatureProvider.shouldShowSmsMirroring(mContext)).thenReturn(true);
|
||||
mSmsMirroringPreferenceController.mIsAvailable = true;
|
||||
|
||||
final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
|
||||
mContext);
|
||||
|
||||
assertThat(keys).isNotNull();
|
||||
assertThat(keys).doesNotContain(mSmsMirroringPreferenceController.getPreferenceKey());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNonIndexableKeys_existInXmlLayout() {
|
||||
final Context context = RuntimeEnvironment.application;
|
||||
|
@@ -24,7 +24,6 @@ import android.content.Context;
|
||||
import com.android.settings.accounts.AccountFeatureProvider;
|
||||
import com.android.settings.applications.ApplicationFeatureProvider;
|
||||
import com.android.settings.bluetooth.BluetoothFeatureProvider;
|
||||
import com.android.settings.connecteddevice.SmsMirroringFeatureProvider;
|
||||
import com.android.settings.dashboard.DashboardFeatureProvider;
|
||||
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
|
||||
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
|
||||
@@ -61,7 +60,6 @@ public class FakeFeatureFactory extends FeatureFactory {
|
||||
public final UserFeatureProvider userFeatureProvider;
|
||||
public final AssistGestureFeatureProvider assistGestureFeatureProvider;
|
||||
public final BluetoothFeatureProvider bluetoothFeatureProvider;
|
||||
public final SmsMirroringFeatureProvider smsMirroringFeatureProvider;
|
||||
public final SlicesFeatureProvider slicesFeatureProvider;
|
||||
public SearchFeatureProvider searchFeatureProvider;
|
||||
public final AccountFeatureProvider mAccountFeatureProvider;
|
||||
@@ -101,7 +99,6 @@ public class FakeFeatureFactory extends FeatureFactory {
|
||||
userFeatureProvider = mock(UserFeatureProvider.class);
|
||||
assistGestureFeatureProvider = mock(AssistGestureFeatureProvider.class);
|
||||
bluetoothFeatureProvider = mock(BluetoothFeatureProvider.class);
|
||||
smsMirroringFeatureProvider = mock(SmsMirroringFeatureProvider.class);
|
||||
slicesFeatureProvider = mock(SlicesFeatureProvider.class);
|
||||
mAccountFeatureProvider = mock(AccountFeatureProvider.class);
|
||||
}
|
||||
@@ -176,11 +173,6 @@ public class FakeFeatureFactory extends FeatureFactory {
|
||||
return assistGestureFeatureProvider;
|
||||
}
|
||||
|
||||
@Override
|
||||
public SmsMirroringFeatureProvider getSmsMirroringFeatureProvider() {
|
||||
return smsMirroringFeatureProvider;
|
||||
}
|
||||
|
||||
@Override
|
||||
public SlicesFeatureProvider getSlicesFeatureProvider() {
|
||||
return slicesFeatureProvider;
|
||||
|
Reference in New Issue
Block a user