Use external/robolectric-shadows/run_robotests.mk
This allows Settings to test against the latest framework changes. Also replaced TestConfig with traditional robolectric.properties. Bug: 73173204 Bug: 73892008 Test: make -j56 RunSettingsRoboTests Change-Id: I3135b4fa5f095ba79b282a76f45dd9baa2584bc7
This commit is contained in:
@@ -26,7 +26,6 @@ import android.content.Context;
|
||||
import android.hardware.input.InputManager;
|
||||
import android.view.InputDevice;
|
||||
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
|
||||
import org.junit.Before;
|
||||
@@ -43,7 +42,6 @@ import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class GameControllerPreferenceControllerTest {
|
||||
|
||||
@Mock
|
||||
@@ -124,7 +122,6 @@ public class GameControllerPreferenceControllerTest {
|
||||
public void updateNonIndexableKeys_shouldIncludeCategoryAndPrefKeys() {
|
||||
when(mInputManager.getInputDeviceIds()).thenReturn(new int[]{});
|
||||
|
||||
|
||||
final List<String> nonIndexables = new ArrayList<>();
|
||||
mController.updateNonIndexableKeys(nonIndexables);
|
||||
|
||||
|
Reference in New Issue
Block a user