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:
@@ -29,7 +29,6 @@ import android.view.InputDevice;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.testutils.shadow.ShadowInputDevice;
|
||||
|
||||
import org.junit.After;
|
||||
@@ -42,7 +41,6 @@ import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class PhysicalKeyboardPreferenceControllerTest {
|
||||
|
||||
@Mock
|
||||
@@ -84,11 +82,9 @@ public class PhysicalKeyboardPreferenceControllerTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
@Config(shadows = {
|
||||
ShadowInputDevice.class,
|
||||
})
|
||||
@Config(shadows = ShadowInputDevice.class)
|
||||
public void updateState_noKeyboard_setDisconnectedSummary() {
|
||||
ShadowInputDevice.sDeviceIds = new int[]{};
|
||||
ShadowInputDevice.sDeviceIds = new int[0];
|
||||
mController.updateState(mPreference);
|
||||
|
||||
verify(mPreference).setSummary(R.string.disconnected);
|
||||
@@ -108,5 +104,4 @@ public class PhysicalKeyboardPreferenceControllerTest {
|
||||
|
||||
verify(mPreference).setSummary(device.getName());
|
||||
}
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user