Use binary resource support in robolectric
The resources available to tests are now exactly the merged resources located in the APK under test. Bug: 74359828 Test: make -j56 RunSettingsRoboTests Change-Id: I050db81a92decefea23314b5ec7a62f77ff4bb2b
This commit is contained in:
@@ -34,7 +34,6 @@ import android.provider.Settings;
|
||||
|
||||
import androidx.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
|
||||
import com.android.settings.widget.ValidatedEditTextPreference;
|
||||
|
||||
@@ -44,11 +43,12 @@ import org.junit.runner.RunWith;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
import org.robolectric.shadows.ShadowApplication;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
@Config(shadows = {ShadowBluetoothAdapter.class})
|
||||
public class DeviceNamePreferenceControllerTest {
|
||||
private static final String TESTING_STRING = "Testing";
|
||||
@@ -178,12 +178,6 @@ public class DeviceNamePreferenceControllerTest {
|
||||
}
|
||||
|
||||
private void acceptDeviceName(boolean accept) {
|
||||
mController.setHost(
|
||||
new DeviceNamePreferenceController.DeviceNamePreferenceHost() {
|
||||
@Override
|
||||
public void showDeviceNameWarningDialog(String deviceName) {
|
||||
mController.updateDeviceName(accept);
|
||||
}
|
||||
});
|
||||
mController.setHost(deviceName -> mController.updateDeviceName(accept));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user